From: Keir Fraser Date: Wed, 27 May 2009 11:00:51 +0000 (+0100) Subject: [IA64] adjust ia64 xc_domain_restore() signature X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13866 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=b0a6b122934267f2e9ab0b19a000bde4cf7170b8;p=xen.git [IA64] adjust ia64 xc_domain_restore() signature This patch fixes the following error. ia64/xc_ia64_linux_restore.c:546: error: conflicting types for xc_domain_restore ./xenguest.h:49: error: previous declaration of xc_domain_restore was here make[4]: *** [ia64/xc_ia64_linux_restore.o] Error 1 Signed-off-by: Isaku Yamahata --- diff --git a/tools/libxc/ia64/xc_ia64_linux_restore.c b/tools/libxc/ia64/xc_ia64_linux_restore.c index 69f4e89250..1e2d9a038f 100644 --- a/tools/libxc/ia64/xc_ia64_linux_restore.c +++ b/tools/libxc/ia64/xc_ia64_linux_restore.c @@ -540,9 +540,9 @@ xc_ia64_hvm_domain_setup(int xc_handle, uint32_t dom) int xc_domain_restore(int xc_handle, int io_fd, uint32_t dom, - unsigned int store_evtchn, unsigned long *store_mfn, - unsigned int console_evtchn, unsigned long *console_mfn, - unsigned int hvm, unsigned int pae) + unsigned int store_evtchn, unsigned long *store_mfn, + unsigned int console_evtchn, unsigned long *console_mfn, + unsigned int hvm, unsigned int pae, int superpages) { DECLARE_DOMCTL; int rc = 1;